From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Mon, 22 Jan 2007 08:28:34 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~2699
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=be2b7941125a7577242988cd399c0fd2dfcc9fb6;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1aae0838a90..e93cf68f77b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2007-01-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* term/mac-win.el (mac-keyboard-modifier-mask-alist): New constant.
+	(mac-ae-keyboard-modifiers): New function.
+	(mac-handle-toolbar-switch-mode): Use it.
+	(mac-dnd-handle-drag-n-drop-event): Likewise.  Set action to `copy'
+	if keyboard modifiers on drop contain option key.
+	(mac-dnd-drop-data): Add optional argument `action'.
+	(special-event-map): Remove binding for M-drag-n-drop.
+
 2007-01-21  Guanpeng Xu  <herberteuler@hotmail.com>
 
 	* add-log.el (add-log-current-defun): Use CC Mode functions to
diff --git a/src/ChangeLog b/src/ChangeLog
index 0452420511c..9bf4867796c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macselect.c [TARGET_API_MAC_CARBON] (mac_do_receive_drag): Don't
+	pass keyboard modifiers to mac_store_drag_event, but put them as
+	kEventParamKeyModifiers Apple event parameter.
+
 2007-01-21  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xdisp.c (try_window): Revert previous change.